Fix extraction of version number if sources are inside another Git repository #1362
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jougs
approved these changes
Dec 11, 2019
There was a problem hiding this comment.
First of all, I consider the act of downloading tarballs into git-managed source directories and building them therein, as well as in-source-builds in general to be totally evil.
That said, I acknowledge that there are valid (but probably nonetheless evil) use cases where this might happen in automatic builds and we should report the right version numbers also in these cases.
Many thanks for addressing this!
heplesser
added
ZC: Installation
heplesser
requested changes
Dec 11, 2019
There was a problem hiding this comment.
@steffengraber Looks good to me, but the indentation on lines 43-56 seems off. Shouldn't the execute_process on line 43 align with the one on line 36, and correspondingly the ifs on lines 50 and 54? It seems the file contains Tabs which may cause the trouble.
heplesser
approved these changes
Dec 12, 2019
jougs
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem:
If you are inside the folder structure of a git repository and you install NEST within this repository from the source download files (e.g. v2.18.0.tar.gz), the hash of the last commit of the git repository will be displayed as the NEST version number instead of the version of the download package .
This also happens within the conda forge packages.
The solution:
It is checked if there is a .
gitfolder inside the source folder. Only then it tries to create the version from the git information. If the folder does not exist, the given version information (UNKNOWN, nest-2.18 ...) is used.This pull request fixes #1347 .